Merge from emacs-24
authorChong Yidong <cyd@gnu.org>
Fri, 2 Nov 2012 00:35:14 +0000 (08:35 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 2 Nov 2012 00:35:14 +0000 (08:35 +0800)

Trivial merge